Merge version 1:6.0.4-3+rpi1 and 1:6.0.5-2 to produce 1:6.0.5-2+rpi1

diff --cc debian/changelog
index e3dc4e050207327a24433e2479710c3e65398c05,e3a1a9fcfa0b088b9c280032aff694b3adc76b89..072a628d3ef66b3e1040e353b350e5780a1c66be
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- suricata (1:6.0.4-3+rpi1) bookworm-staging; urgency=medium
++suricata (1:6.0.5-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:21:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Dec 2021 23:10:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 May 2022 06:46:14 +0000
++
+ suricata (1:6.0.5-2) unstable; urgency=medium
+ 
+   * Introduce patch to fix segfaulting autopkgtests on s390x.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 28 Apr 2022 08:51:06 +0200
+ 
+ suricata (1:6.0.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Raise libhtp minimum dependency version to 0.5.40.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 21 Apr 2022 19:53:32 +0200
  
  suricata (1:6.0.4-3) unstable; urgency=medium